Index: specialpurpose/googlebase/widget/GoogleBaseScreens.xml
===================================================================
--- specialpurpose/googlebase/widget/GoogleBaseScreens.xml	(revision 941641)
+++ specialpurpose/googlebase/widget/GoogleBaseScreens.xml	(working copy)
@@ -21,10 +21,11 @@
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
 
-    <screen name="advancedsearch">
+    <screen name="gbaseadvancedsearch">
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleAdvancedSearch"/>
+                <set field="tabButtonItem" value="gbaseadvancedsearch"/>
                 <entity-condition entity-name="ProductCategory" list="productCategories">
                     <condition-expr field-name="showInSelect" operator="not-equals" value="N"/>
                     <order-by field-name="description"/>
@@ -33,7 +34,7 @@
                 <script location="component://googlebase/webapp/googlebase/WEB-INF/actions/GoogleBaseAdvancedSearch.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonFindDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="GoogleBaseDecorator" location="component://googlebase/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl"/></html>
@@ -44,14 +45,15 @@
         </section>
     </screen>
 
-    <screen name="keywordsearch">
+    <screen name="gbasekeywordsearch">
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleSearchResults"/>
+                <set field="tabButtonItem" value="gbaseadvancedsearch"/>
                 <script location="component://product/webapp/catalog/WEB-INF/actions/find/keywordsearch.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="CommonFindDecorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="GoogleBaseDecorator" location="component://googlebase/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <platform-specific>
                             <html><html-template location="component://product/webapp/catalog/find/keywordsearch.ftl"/></html>
@@ -68,12 +70,12 @@
     <screen name="ProductsExportToGoogle">
         <section>
             <actions>
-                <set field="headerItem" value="googlebase"/>
                 <set field="titleProperty" value="PageTitleGoogleBaseProductsExportToGoogle"/>
+                <set field="tabButtonItem" value="gbaseadvancedsearch"/>
                 <script location="component://googlebase/webapp/googlebase/WEB-INF/actions/productsExportToGoogle.groovy"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="GoogleBaseDecorator" location="component://googlebase/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <screenlet title="${uiLabelMap.PageTitleGoogleBaseProductsExportToGoogle}">
                             <include-form name="ProductsExportToGoogle" location="component://googlebase/widget/GoogleBaseForms.xml"/>
@@ -83,41 +85,16 @@
             </widgets>
         </section>
     </screen>
-    <screen name="EditProduct">
-        <section>
-            <actions>
-                <set field="titleProperty" value="PageTitleEditProduct"/>
-                <set field="tabButtonItem" value="EditProduct"/>
-                <set field="labelTitleProperty" value="ProductProduct"/>
 
-                <set field="productId" from-field="parameters.productId"/>
-                <entity-one entity-name="Product" value-field="product"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <screenlet title="${uiLabelMap.PageTitleEditProduct}">
-                            <include-form name="EditProduct" location="component://product/widget/catalog/ProductForms.xml"/>
-                        </screenlet>
-                        <!-- include the duplicate product form template -->
-                        <screenlet title="${uiLabelMap.ProductDuplicateProduct}">
-                            <include-form name="EditProductDup" location="component://product/widget/catalog/ProductForms.xml"/>
-                        </screenlet>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
-
     <screen name="EditGoogleBaseConfigs">
         <section>
             <actions>
                 <set field="titleProperty" value="GoogleBaseConfiguration"/>
-                <set field="headerItem" value="GoogleBaseConfigs"/>
+                <set field="tabButtonItem" value="GoogleBaseConfigs"/>
                 <set field="productStoreId" from-field="parameters.productStoreId"/>
             </actions>
             <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                <decorator-screen name="GoogleBaseDecorator" location="component://googlebase/widget/CommonScreens.xml">
                     <decorator-section name="body">
                         <include-form name="ListGoogleBaseConfigs" location="component://googlebase/widget/GoogleBaseForms.xml"/>
                         <screenlet id="add-gbs-configuration" title="${uiLabelMap.GoogleBaseAddGoogleBaseConfiguration}" collapsible="true">
Index: specialpurpose/googlebase/widget/CommonScreens.xml
===================================================================
--- specialpurpose/googlebase/widget/CommonScreens.xml	(revision 941641)
+++ specialpurpose/googlebase/widget/CommonScreens.xml	(working copy)
@@ -21,103 +21,21 @@
 <screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
 
-    <screen name="main-decorator">
+    <screen name="GoogleBaseDecorator">
         <section>
             <actions>
                 <property-map resource="GoogleBaseUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
-                <set field="activeApp" value="googlebase" global="true"/>
-
-                <set field="layoutSettings.companyName" from-field="uiLabelMap.GoogleBaseCompanyName" global="true"/>
-                <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.GoogleBaseApplication" global="true"/>
-                <set field="applicationMenuName" value="GoogleBaseAppBar" global="true"/>
-                <set field="applicationMenuLocation" value="component://googlebase/widget/GoogleBaseMenus.xml" global="true"/>
-                <set field="applicationTitle" value="${uiLabelMap.GoogleBaseApplication}" global="true"/>
+                <set field="headerItem" value="GoogleBase" global="true"/>
             </actions>
             <widgets>
-                <include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
-            </widgets>
-        </section>
-    </screen>
-
-    <screen name="CommonFindDecorator">
-        <section>
-            <actions>
-                <set field="headerItem" value="googlebase"/>
-            </actions>
-            <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <section>
-                            <condition>
-                                <if-has-permission permission="GOOGLEBASE" action="_VIEW"/>
-                            </condition>
-                            <widgets>
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.GoogleBaseViewPermissionError}</label>
-                            </fail-widgets>
-                        </section>
+                        <include-menu location="component://googlebase/widget/GoogleBaseMenus.xml" name="GoogleBaseAppBar"/>
+                        <decorator-section-include name="body"/>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
 
-    <screen name="CommonProductDecorator">
-        <section>
-            <actions>
-                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
-
-                <set field="productId" from-field="parameters.productId"/>
-                <entity-one entity-name="Product" value-field="product"/>
-                <set field="productName" from-field="product.productName"/>
-            </actions>
-            <widgets>
-                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                    <decorator-section name="body">
-                        <section>
-                            <!-- do check for GOOGLEBASE, _VIEW permission -->
-                            <condition>
-                                <if-has-permission permission="GOOGLEBASE" action="_VIEW"/>
-                            </condition>
-                            <widgets>
-                                <section>
-                                    <condition><not><if-empty field="product"/></not></condition>
-                                    <widgets>
-                                        <include-menu name="ProductTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/>
-                                        <container>
-                                            <label style="h1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${product.internalName} [${uiLabelMap.CommonId}:${productId}]  ${${extraFunctionName}}</label>
-                                            <image src="${product.smallImageUrl}" height="40" width="40" url-mode="content"/>
-                                        </container>
-
-                                        <!-- add Create Product and View Product (in ecommerce) links -->
-                                        <container style="button-bar">
-                                            <link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/>
-                                            <link target="CreateVirtualWithVariantsForm" text="${uiLabelMap.ProductNewVirtualProduct}" style="buttontext"/>
-                                            <link target="/ecommerce/control/product" url-mode="inter-app" text="${uiLabelMap.ProductProductPage}" style="buttontext">
-                                                <parameter param-name="product_id" from-field="productId"/>
-                                            </link>
-                                            <link target="ProductBarCode.pdf" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext">
-                                                <parameter param-name="productId"/>
-                                                <parameter param-name="productName"/>
-                                            </link>
-                                        </container>
-                                    </widgets>
-                                </section>
-
-                                <decorator-section-include name="body"/>
-                            </widgets>
-                            <fail-widgets>
-                                <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label>
-                            </fail-widgets>
-                        </section>
-                    </decorator-section>
-                </decorator-screen>
-            </widgets>
-        </section>
-    </screen>
 </screens>
\ No newline at end of file
Index: specialpurpose/googlebase/widget/GoogleBaseInjectMenus.xml
===================================================================
--- specialpurpose/googlebase/widget/GoogleBaseInjectMenus.xml	(revision 0)
+++ specialpurpose/googlebase/widget/GoogleBaseInjectMenus.xml	(revision 0)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<inject-menus xsi:noNamespaceSchemaLocation="../../../framework/widget/dtd/widget-menu-extend.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <inject-menu name="CatalogAppBarExtensions" base-location="component://product/widget/catalog/CatalogMenus.xml" base-name="CatalogAppBar">
+        <actions>
+            <!-- Using a map-name="uiLabelMap" seems to replace the entire map instead of adding to it -->
+            <property-map map-name="myLabelMap" resource="GoogleBaseUiLabels.xml"/>
+        </actions>
+        <menu-item name="GoogleBase" title="${myLabelMap.GoogleBaseApplication}"><link target="gbaseadvancedsearch"/></menu-item>
+    </inject-menu>
+
+</inject-menus>

Property changes on: specialpurpose/googlebase/widget/GoogleBaseInjectMenus.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + "Date Rev Author URL Id"
Added: svn:eol-style
   + native

Index: specialpurpose/googlebase/widget/GoogleBaseMenus.xml
===================================================================
--- specialpurpose/googlebase/widget/GoogleBaseMenus.xml	(revision 941641)
+++ specialpurpose/googlebase/widget/GoogleBaseMenus.xml	(working copy)
@@ -18,8 +18,8 @@
 under the License.
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="GoogleBaseAppBar" title="${uiLabelMap.GoogleBaseApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+    <menu name="GoogleBaseAppBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="GoogleBaseConfigs" title="${uiLabelMap.GoogleBaseConfiguration}"><link target="EditGoogleBaseConfigs"/></menu-item>
-        <menu-item name="googlebase" title="${uiLabelMap.GoogleBaseExportToGoogle}"><link target="advancedsearch"/></menu-item>
+        <menu-item name="gbaseadvancedsearch" title="${uiLabelMap.GoogleBaseExportToGoogle}"><link target="gbaseadvancedsearch"/></menu-item>
     </menu>
 </menus>
Index: specialpurpose/googlebase/ofbiz-component.xml
===================================================================
--- specialpurpose/googlebase/ofbiz-component.xml	(revision 941641)
+++ specialpurpose/googlebase/ofbiz-component.xml	(working copy)
@@ -32,12 +32,10 @@
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
 
-    <webapp name="googlebase"
-        title="Google Base"
-        menu-name="secondary"
-        server="default-server"
-        location="webapp/googlebase"
-        base-permission="GOOGLEBASE"
-        mount-point="/googlebase"
-        app-bar-display="true"/>
+    <injections>
+        <inject-controller into-location="component://product/webapp/catalog/WEB-INF/controller.xml"
+                           from-location="component:///googlebase/webapp/googlebase/WEB-INF/controller.xml"/>
+        <inject-menus location="component://googlebase/widget/GoogleBaseInjectMenus.xml"/>
+    </injections>
+
 </ofbiz-component>
Index: specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl
===================================================================
--- specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl	(revision 941641)
+++ specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl	(working copy)
@@ -58,7 +58,7 @@
     <h3>${uiLabelMap.ProductAdvancedSearchInCategory}</h3>
   </div>
   <div class="screenlet-body">
-    <form id="advToKeywordSearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>" style="margin: 0;">
+    <form id="advToKeywordSearchform" method="post" action="<@ofbizUrl>gbasekeywordsearch</@ofbizUrl>" style="margin: 0;">
       <fieldset>
         <input type="hidden" name="VIEW_SIZE" value="25"/>
         <input type="hidden" name="PAGING" value="Y"/>
Index: specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/GoogleBaseAdvancedSearch.groovy
===================================================================
--- specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/GoogleBaseAdvancedSearch.groovy	(revision 941641)
+++ specialpurpose/googlebase/webapp/googlebase/WEB-INF/actions/GoogleBaseAdvancedSearch.groovy	(working copy)
@@ -32,6 +32,9 @@
     productStoreId = ProductStoreWorker.getProductStoreId(request);
 }
 googleBaseConfigList = delegator.findList("GoogleBaseConfig", null, null, null, null, false);
+if (!productStoreId && googleBaseConfigList) {
+    productStoreId = EntityUtil.getFirst(googleBaseConfigList).productStoreId;
+}
 if (productStoreId) {
     productStoreCatalogs = CatalogWorker.getStoreCatalogs(delegator, productStoreId);
     if (productStoreCatalogs) {
Index: specialpurpose/googlebase/webapp/googlebase/WEB-INF/controller.xml
===================================================================
--- specialpurpose/googlebase/webapp/googlebase/WEB-INF/controller.xml	(revision 941641)
+++ specialpurpose/googlebase/webapp/googlebase/WEB-INF/controller.xml	(working copy)
@@ -20,15 +20,19 @@
 
 <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd">
-    <include location="component://product/webapp/catalog/WEB-INF/controller.xml"/>
 
     <description>Google Base Component Site Configuration File</description>
 
-    <request-map uri="main">
+    <request-map uri="gbaseadvancedsearch">
         <security https="true" auth="true"/>
-        <response name="success" type="view" value="main"/>
+        <response name="success" type="view" value="gbaseadvancedsearch"/>
     </request-map>
 
+    <request-map uri="gbasekeywordsearch">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="gbasekeywordsearch"/>
+    </request-map>
+
     <request-map uri="ProductsExportToGoogle">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="ProductsExportToGoogle"/>
@@ -75,10 +79,8 @@
     <!-- end of request mappings -->
 
     <!-- View Mappings -->
-    <view-map name="main" type="screen" page="component://googlebase/widget/GoogleBaseScreens.xml#advancedsearch"/>
-    <view-map name="advancedsearch" type="screen" page="component://googlebase/widget/GoogleBaseScreens.xml#advancedsearch"/>
-    <view-map name="keywordsearch" type="screen" page="component://googlebase/widget/GoogleBaseScreens.xml#keywordsearch"/>
-    <view-map name="EditProduct" type="screen" page="component://googlebase/widget/GoogleBaseScreens.xml#EditProduct"/>
+    <view-map name="gbaseadvancedsearch" type="screen" page="component://googlebase/widget/GoogleBaseScreens.xml#gbaseadvancedsearch"/>
+    <view-map name="gbasekeywordsearch" type="screen" page="component://googlebase/widget/GoogleBaseScreens.xml#gbasekeywordsearch"/>
     <view-map name="ProductsExportToGoogle" type="screen" page="component://googlebase/widget/GoogleBaseScreens.xml#ProductsExportToGoogle"/>
     <view-map name="EditGoogleBaseConfigs" type="screen" page="component://googlebase/widget/GoogleBaseScreens.xml#EditGoogleBaseConfigs"/>
     <!-- end of view mappings -->
Index: specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml
===================================================================
--- specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml	(revision 941641)
+++ specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml	(working copy)
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<web-app>
-    <display-name>Open For Business - Google Base</display-name>
-    <description>Google Base component of the Open For Business Project</description>
-
-    <context-param>
-        <param-name>webSiteId</param-name>
-        <param-value>GOOGLEBASE</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
-    </context-param>
-    <context-param>
-        <param-name>entityDelegatorName</param-name>
-        <param-value>default</param-value>
-        <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
-    </context-param>
-    <context-param>
-        <param-name>localDispatcherName</param-name>
-        <param-value>googlebase</param-value>
-        <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
-    </context-param>
-    <context-param>
-        <param-name>mainDecoratorLocation</param-name>
-        <param-value>component://googlebase/widget/CommonScreens.xml</param-value>
-        <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
-    </context-param>
-
-    <filter>
-        <filter-name>ContextFilter</filter-name>
-        <display-name>ContextFilter</display-name>
-        <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
-        <init-param>
-            <param-name>disableContextSecurity</param-name>
-            <param-value>N</param-value>
-        </init-param>
-        <init-param>
-            <param-name>allowedPaths</param-name>
-            <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
-        </init-param>
-        <init-param>
-            <param-name>errorCode</param-name>
-            <param-value>403</param-value>
-        </init-param>
-        <init-param>
-            <param-name>redirectPath</param-name>
-            <param-value>/control/main</param-value>
-        </init-param>
-    </filter>
-    <filter-mapping>
-        <filter-name>ContextFilter</filter-name>
-            <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <listener><listener-class>org.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
-    <listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
-
-    <servlet>
-        <servlet-name>ControlServlet</servlet-name>
-        <display-name>ControlServlet</display-name>
-        <description>Main Control Servlet</description>
-        <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>ControlServlet</servlet-name>
-        <url-pattern>/control/*</url-pattern>
-    </servlet-mapping>
-
-    <session-config>
-        <session-timeout>60</session-timeout> <!-- in minutes -->
-    </session-config>
-
-    <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
-        <welcome-file>index.html</welcome-file>
-        <welcome-file>index.htm</welcome-file>
-    </welcome-file-list>
-</web-app>